From 8d3c9d9309138923369afbfc6840c96d40c5eab9 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Sat, 27 Nov 2004 16:51:57 +0000 Subject: [PATCH] bitkeeper revision 1.1159.187.25 (41a8b0admRKvVdWsmfs_qXGyCg4BZg) Check virtual interrupt mask rather than real interrupt flag in Linux 2.6 entry.S. Also fix tabbing in failsafe_callback. --- .../arch/xen/i386/kernel/entry.S | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S index e8cc250593..281e06ebc1 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S @@ -231,8 +231,8 @@ need_resched: movl TI_flags(%ebp), %ecx # need_resched set ? testb $_TIF_NEED_RESCHED, %cl jz restore_all - testl $IF_MASK,EFLAGS(%esp) # interrupts off (exception path) ? - jz restore_all + testb $0xFF,EVENT_MASK(%esp) # interrupts off (exception path) ? + jnz restore_all movl $PREEMPT_ACTIVE,TI_preempt_count(%ebp) XEN_UNBLOCK_EVENTS(%esi) call schedule @@ -552,13 +552,13 @@ critical_fixup_table: # Hypervisor uses this for application faults while it executes. ENTRY(failsafe_callback) -1: popl %ds -2: popl %es -3: popl %fs -4: pop %gs - subl $4,%esp - SAVE_ALL - jmp ret_from_exception +1: popl %ds +2: popl %es +3: popl %fs +4: popl %gs + subl $4,%esp + SAVE_ALL + jmp ret_from_exception .section .fixup,"ax"; \ 6: movl $0,(%esp); \ jmp 1b; \ -- 2.30.2